diff --git a/src/Infrastructure.EntityFramework/EntityFrameworkServiceCollectionExtensions.cs b/src/Infrastructure.EntityFramework/EntityFrameworkServiceCollectionExtensions.cs
index e2227167a6..af66106e81 100644
--- a/src/Infrastructure.EntityFramework/EntityFrameworkServiceCollectionExtensions.cs
+++ b/src/Infrastructure.EntityFramework/EntityFrameworkServiceCollectionExtensions.cs
@@ -1,4 +1,5 @@
-using Bit.Core.AdminConsole.Repositories;
+using System.Diagnostics;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Auth.Repositories;
 using Bit.Core.Billing.Organizations.Repositories;
 using Bit.Core.Billing.Providers.Repositories;
@@ -25,6 +26,7 @@ using Bit.Infrastructure.EntityFramework.Repositories;
 using Bit.Infrastructure.EntityFramework.SecretsManager.Repositories;
 using Bit.Infrastructure.EntityFramework.Tools.Repositories;
 using Bit.Infrastructure.EntityFramework.Vault.Repositories;
+using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
@@ -40,9 +42,6 @@ public static class EntityFrameworkServiceCollectionExtensions
             throw new Exception($"Database provider type {provider} was selected but no connection string was found.");
         }
 
-        // TODO: We should move away from using LINQ syntax for EF (TDL-48).
-        LinqToDBForEFTools.Initialize();
-
         services.AddAutoMapper(typeof(UserRepository));
         services.AddDbContext<DatabaseContext>(options =>
         {
@@ -65,6 +64,35 @@ public static class EntityFrameworkServiceCollectionExtensions
             {
                 options.UseSqlServer(connectionString);
             }
+
+            // Configure LinqToDB with the types of drivers we use for each DB type, this allows to us avoid it searching
+            // for assemblies and gives us the ability to publish as a single file.
+            options.UseLinqToDB(linq =>
+            {
+                linq.AddCustomOptions(linqOptions =>
+                {
+                    if (provider == SupportedDatabaseProviders.Postgres)
+                    {
+                        return linqOptions.UsePostgreSQL();
+                    }
+                    else if (provider == SupportedDatabaseProviders.MySql)
+                    {
+                        return linqOptions.UseMySqlConnector();
+                    }
+                    else if (provider == SupportedDatabaseProviders.Sqlite)
+                    {
+                        return linqOptions.UseSQLiteMicrosoft();
+                    }
+                    else if (provider == SupportedDatabaseProviders.SqlServer)
+                    {
+                        return linqOptions.UseSqlServer(provider: LinqToDB.DataProvider.SqlServer.SqlServerProvider.MicrosoftDataSqlClient);
+                    }
+
+                    Debug.Fail("Unknown database provider.");
+
+                    return linqOptions;
+                });
+            });
         });
     }